Auto merge of #1341 - alexcrichton:issue-1333, r=huonw
authorbors <bors@rust-lang.org>
Tue, 24 Feb 2015 00:17:22 +0000 (00:17 +0000)
committerbors <bors@rust-lang.org>
Tue, 24 Feb 2015 00:17:22 +0000 (00:17 +0000)
Closes #1333


Trivial merge